Merge branch 'master' into Mario/electro_combo_over_time

diff --cc .gitlab-ci.yml
index 4eda377143c3784077683541a7a2ef86fcedbad6,d1ed8f09324da32f73d164e4e96bd4043ea3e241..f144008dddbeb9e2a20540be591efaf29e23f012
--- 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=10ddd4483a30f78a0aa95d9d0d573659
 -    - export EXPECT=7004fcba787d0fbe17240beb84d8af3c
++    - export EXPECT=68767d02998c4c842f592e1c916eaebe
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?