Merge branch 'master' into Mario/vaporizer_damage

diff --cc bal-wep-nexuiz25.cfg
Simple merge

diff --cc bal-wep-samual.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc bal-wep-xpm.cfg
Simple merge

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

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