Merge branch 'master' into martin-t/mg-solidpen

diff --cc bal-wep-xonotic.cfg
Simple merge

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

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

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge

diff --cc vehicles.cfg
Simple merge

diff --cc xonotic-server.cfg
Simple merge