Merge remote-tracking branch 'origin/master' into morosophos/server-current4

diff --cc qcsrc/server/compat/quake3.qc
Simple merge

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

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

diff --cc xonotic-server.cfg
Simple merge