Merge branch 'master' into Mario/electro_combo_over_time

diff --cc .gitlab-ci.yml
index f144008dddbeb9e2a20540be591efaf29e23f012,16e13d91ce836ee09964b9efe5717004966c8015..05d1f289e3f2dede2fa97e6b7b5faa68092e6beb
--- 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=68767d02998c4c842f592e1c916eaebe
 -    - export EXPECT=49dd33d7cc256afd1948271facfaf948
++    - export EXPECT=6ca6457473935e3b7b8ba21ae76032ee
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?
  

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-nexuiz25.cfg
Simple merge

diff --cc bal-wep-samual.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge