Merge branch 'master' into drjaska/mgdamageaccumulation

diff --cc .gitlab-ci.yml
index 84904d6b80a57b55576c95bf9b24b7ec9b2f4789,4786135071adaff32b7356f565fe81379a46d8d2..325a3626d99c55af703d7915ad9e617107c968d6
--- 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=e34ec0854b553baf190793e9cc95a5ac\r
 -    - EXPECT=f2226bf353b6ff3dd3c489a742ce4e6a\r
++    - EXPECT=630e600cd60eab742485229c3c1a2935\r
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | sed -e 's,^\[[^]]*\] ,,'\r