Merge branch 'master' into Mario/qc_physics_prehax

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/main.qc
Simple merge

diff --cc qcsrc/client/view.qc
Simple merge

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

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

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_nades.qc
Simple merge

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

diff --cc qcsrc/warpzonelib/util_server.qc
Simple merge