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

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

diff --cc qcsrc/server/vehicles/racer.qc
Simple merge

diff --cc qcsrc/server/vehicles/raptor.qc
Simple merge

diff --cc qcsrc/server/vehicles/spiderbot.qc
Simple merge

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