Merge branch 'master' into Mario/electro_combo_over_time

diff --cc .gitlab-ci.yml
index d27e6837e509bb1c0e8406a7009d00d46ac38f8d,c0057d597584ff0ad2cd54731a34c759d8e8c82a..4eda377143c3784077683541a7a2ef86fcedbad6
--- 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=2fc7c0b22c9d397162e552a2e48256c3
 -    - export EXPECT=13aa630f559c7683195b8c8d5e0a1522
++    - export EXPECT=10ddd4483a30f78a0aa95d9d0d573659
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?