Merge branch 'master' into Mario/electro_combo_over_time

diff --cc .gitlab-ci.yml
index 21bef8d5d5a402edd39dbed9744c3b603c6a4256,55eb8a1bb81b593d300a6c4de7567366fba083b5..0bca6f4e8fbfdf61ae7830db84e7d66693fa5670
--- 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=7b432dcf92ddf6919d12eef3b14cae54
 -    - export EXPECT=e67187c8446f97a8b062a431dccb89e0
++    - export EXPECT=8aec9e8dd8fb0a69e500979f67d4f7e8
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?