Merge branch 'master' into drjaska/balance/crylink

diff --cc .gitlab-ci.yml
index 2ae0be7b29a92f986e2a4a61d081bd4ee8ba6a2d,4786135071adaff32b7356f565fe81379a46d8d2..1a6556a6ee9e9b762cef06989c855c6bca189910
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -75,7 -75,7 +75,7 @@@ test_sv_game
      - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
      - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
  \r
-     - EXPECT=87544a323c7c19ccdb403c730e9dedc5\r
 -    - EXPECT=f2226bf353b6ff3dd3c489a742ce4e6a\r
++    - EXPECT=9740715c065f303604ac48cd518e940f\r
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | sed -e 's,^\[[^]]*\] ,,'\r