Merge branch 'master' into TimePath/gametypes/infection

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/common/mapinfo.qc
Simple merge

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

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

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

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

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