Merge branch 'master' into mirceakitsune/sandbox

diff --cc qcsrc/server/mutators/mutators.qh
index 1cd07929ef4db9048ce3471af8d1e4d6bd4a357b,b53153f7bfc4048b96fa0124d694670b8662d0ac..825062e1cdcd50bdd0429502921eec76c4377a59
--- 1/qcsrc/server/mutators/mutators.qh
--- 2/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -7,6 -7,6 +7,7 @@@ MUTATOR_DECLARATION(mutator_nix)
  MUTATOR_DECLARATION(mutator_dodging);
  MUTATOR_DECLARATION(mutator_rocketflying);
  MUTATOR_DECLARATION(mutator_vampire);
+ MUTATOR_DECLARATION(mutator_spawn_near_teammate);
++MUTATOR_DECLARATION(mutator_spawn_near_teammate);
  
  MUTATOR_DECLARATION(sandbox);
- MUTATOR_DECLARATION(mutator_spawn_near_teammate);