Merge remote-tracking branch 'origin/master' into samual/combined_updates

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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

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

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