Merge branch 'master' into Mario/monsters

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

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

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

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