Merge branch 'master' into martin-t/linkexplode

diff --cc .gitlab-ci.yml
index ef89ee7aa96f84f616eef26dae15cd3eec2ba4ad,8724d06617940c0ed8cf76c67ad0fc94a25cb5a9..8730235738fb81f087e65d399f013126c8268487
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -29,7 -29,7 +29,8 @@@ test_sv_game
      - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
      - make
-     - EXPECT=c80adc89bf58bb22252dd0536b34126b
++
+     - EXPECT=892e447048e051e51f30cff2affc729a
      - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
        | tee /dev/stderr
        | grep '^:'

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc bal-wep-xpm.cfg
Simple merge