Merge branch 'master' into martin-t/AMMO

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
Simple merge

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

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

diff --cc xonotic-server.cfg
Simple merge