Merged master

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/client.qc
index 3f9273b3ca52bfb11eda2f66eb4591b0e64fccaa,804868fa0031ac041b3e24cf65ae737fb0bed114..513a79678075668f3753857df65fd0716ee1a961
--- 1/qcsrc/server/client.qc
--- 2/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -885,13 -888,11 +890,13 @@@ void ClientKill_Now(entity this
  
        this.killindicator = NULL;
  
-       if(this.killindicator_teamchange)
+       if(CS(this).killindicator_teamchange)
                ClientKill_Now_TeamChange(this);
  
 -      if(!IS_SPEC(this) && !IS_OBSERVER(this))
 +      if (!IS_SPEC(this) && !IS_OBSERVER(this) && MUTATOR_CALLHOOK(ClientKill_Now, this) == false)
 +      {
                Damage(this, this, this, 100000, DEATH_KILL.m_id, this.origin, '0 0 0');
 +      }
  
        // now I am sure the player IS dead
  }

diff --cc qcsrc/server/command/cmd.qc
Simple merge

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

diff --cc qcsrc/server/mutators/events.qh
Simple merge

diff --cc qcsrc/server/player.qc
Simple merge

diff --cc qcsrc/server/player.qh
Simple merge

diff --cc qcsrc/server/teamplay.qc
Simple merge