Merge branch 'master' into drjaska/gib-ghost

diff --cc .gitlab-ci.yml
index 48573bc3d43b57242846f4ed781d567489cf6cb9,ce1123086c1f4a1c3a176d38ea4f2add5037f739..aaa01fa28a29d4df0dde9f9469b0d38a96edd10c
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -36,7 -36,7 +36,7 @@@ test_compilation_units
  test_sv_game:
    stage: test
    script:
-     - export EXPECT=1b80629ffd60bdd46befff04559d1fb9
 -    - export EXPECT=4e959184d76f77e368ab5bf445c63cc9
++    - export EXPECT=81acabc17714161feb1dd26af2aeba90
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?
  

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

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

diff --cc qcsrc/server/player.qh
Simple merge

diff --cc xonotic-client.cfg
Simple merge

diff --cc xonotic-server.cfg
Simple merge