Merge branch 'master' into Mario/nexcompat_weaponswap

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

diff --cc qcsrc/common/weapons/weapon/minelayer.qc
Simple merge

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

diff --cc qcsrc/server/weapons/spawning.qc
Simple merge

diff --cc xonotic-server.cfg
Simple merge