Merge branch 'master' into drjaska/balance/crylink

diff --cc .gitlab-ci.yml
index 1cfb5e30ddd396980aab8a2e3642bf85e3614fce,8ba5c18061a8b807617a4ab4c6b602c2ae7c154a..f669332fa99554aaf75918a86e2db3f7e363d00d
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -69,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=587abbff65c9a5fb372807e92f229875\r
 -    - EXPECT=fe5dec36cb304c55acee73afd1e09c0a\r
++    - EXPECT=e9b9647b7cb4ad97fd3322a6ea20c4b7\r
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | sed -e 's,^\[[^]]*\] ,,'\r