Merge branch 'div0-stable' into Lyberta/libgmp

diff --cc .travis-script-xonotic.sh
Simple merge

diff --cc .travis.yml
index 9ea2b34d0fae2eb3b6939fad545b794d456b638c,fbea9bb77b3696aca588f713738e0bafffab8032..6cab6239fcd74e293651056721873e170af3688e
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -29,8 -33,9 +34,10 @@@ matrix
          packages:
            - libxpm-dev
            - libsdl1.2-dev
+           - libxi-dev
+           - libxrandr-dev
            - libxxf86vm-dev
 +          - libgmp-dev
    - os: linux
      env: PROJECT=xonotic OS="win32"
      compiler: gcc