Merge remote branch 'origin/master' into samual/keepaway

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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

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

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

diff --cc qcsrc/server/progs.src
Simple merge