Merge branch 'master' into Mario/is_macro

diff --cc qcsrc/common/monsters/monster/mage.qc
Simple merge

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

diff --cc qcsrc/common/weapons/w_arc.qc
Simple merge

diff --cc qcsrc/common/weapons/w_shotgun.qc
Simple merge

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

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

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

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

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

diff --cc qcsrc/server/tturrets/system/system_main.qc
Simple merge

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

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