Merge branch 'master' into martin-t/maxshotdist

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

diff --cc qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/bumblebee.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/raptor.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/spiderbot.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
Simple merge

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

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

diff --cc qcsrc/server/mutators/mutator/gamemode_assault.qc
index f4b896401035a938504136565747f81c7d95c4de,39987414348d0d3a37556741a320eb755e3a1cb3..28e91f26a3668181c9a0b83b68c483d0fa5673fa
--- 1/qcsrc/server/mutators/mutator/gamemode_assault.qc
--- 2/qcsrc/server/mutators/mutator/gamemode_assault.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_assault.qc
@@@ -1,8 -1,7 +1,9 @@@
  #include "gamemode_assault.qh"
  
 +#include <lib/float.qh>
 +
  .entity sprite;
+ #define AS_ROUND_DELAY 5
  
  // random functions
  void assault_objective_use(entity this, entity actor, entity trigger)

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