Merge branch 'master' into Mario/q3compat_sanity

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

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

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

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

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

diff --cc xonotic-common.cfg
Simple merge