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

diff --cc defaultXonotic.cfg
Simple merge

diff --cc gamemodes.cfg
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
Simple merge

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

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