Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

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

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

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

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

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

diff --cc qcsrc/server/mutators/gamemode_freezetag.qc
Simple merge

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

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