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

diff --cc .gitlab-ci.yml
index edb153ac4598a9dff861f1b7e4251afa8b8d0ca7,4786135071adaff32b7356f565fe81379a46d8d2..f2334ef66d85b13146b778f70ffdb7a1774cd052
--- 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=2e2290a8780a78ea6238a7b3d1386e39\r
 -    - EXPECT=f2226bf353b6ff3dd3c489a742ce4e6a\r
++    - EXPECT=837de85eaf3bb3f9e853fa3de5b3b4af\r
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | sed -e 's,^\[[^]]*\] ,,'\r

diff --cc qcsrc/common/scores.qh
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge