Merge branch 'master' into divVerent/forced-teams-by-idfp

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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