Merge branch 'master' into Mario/monsters

# Conflicts:
#	qcsrc/common/mapinfo.qh

diff --cc qcsrc/common/mapinfo.qh
index fe41609fed5b6f5743c18f58505b237cdbcb4970,6fbb7ce896235d53fe240be81fd83ea0aea25002..adaa0119b6589a77ac6f230145a756e2740f1643
--- 1/qcsrc/common/mapinfo.qh
--- 2/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@@ -472,7 -556,7 +556,7 @@@ REGISTER_GAMETYPE(KEEPAWAY, NEW(Keepawa
  CLASS(Invasion, Gametype)
      INIT(Invasion)
      {
-         this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,"","pointlimit=50 type=0",_("Survive against waves of monsters"));
 -        this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,true,"","pointlimit=50 teams=0 type=0",_("Survive against waves of monsters"));
++        this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,true,"","pointlimit=50 type=0",_("Survive against waves of monsters"));
      }
      METHOD(Invasion, m_parse_mapinfo, bool(string k, string v))
      {

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