Merge remote-tracking branch 'origin/master' into pending-release

diff --cc .gitlab-ci.yml
index 5d850785d188c6460141f542fcea2de50c9ed552,b56f2b44d1b4b126e5b11f3be048aa75e21feaca..61a2cfef5385d969147165cbabd609e8988ebdf5
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -75,10 -75,9 +75,9 @@@ 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=f2226bf353b6ff3dd3c489a742ce4e6a\r
 +    - EXPECT=e7c012825007ed251efa4e52dfbb592e\r
-     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
+     - HASH=$(${ENGINE} +exec serverbench.cfg\r
        | tee /dev/stderr\r
-       | sed -e 's,^\[[^]]*\] ,,'\r
        | grep '^:'\r
        | grep -v '^:gamestart:'\r
        | grep -v '^:anticheat:'\r

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
Simple merge

diff --cc qcsrc/server/world.qc
Simple merge