Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

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

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

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

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

diff --cc qcsrc/server/progs.src
Simple merge

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