Merge branch 'master' into Lyberta/TeamplayFixes_

diff --cc qcsrc/server/client.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