Merge branch 'master' into Mario/ctf_flag_stay

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
index 194ef6eb604fadd8a0ad92c1d54000dd199c5b97,3787c8bfbfe4ba3f298c937f0e1384f4348e6e07..3c31301a54218cc1904875ea7f4e90e60f447965
--- 1/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
--- 2/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
@@@ -18,17 -17,16 +18,17 @@@ IntrusiveList g_flags
  
  REGISTER_MUTATOR(ctf, false)
  {
-     MUTATOR_STATIC();
-     MUTATOR_ONADD
-     {
-         GameRules_teams(true);
-         GameRules_limit_score(autocvar_capturelimit_override);
-         GameRules_limit_lead(autocvar_captureleadlimit_override);
- 
-         g_flags = IL_NEW();
-         ctf_Initialize();
-     }
-     return 0;
+       MUTATOR_STATIC();
+       MUTATOR_ONADD
+       {
+               GameRules_teams(true);
+               GameRules_limit_score(autocvar_capturelimit_override);
+               GameRules_limit_lead(autocvar_captureleadlimit_override);
+ 
++              g_flags = IL_NEW();
+               ctf_Initialize();
+       }
+       return 0;
  }
  
  // used in cheats.qc