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

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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

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

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

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

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

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

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

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