Merge branch 'master' into Mario/q3compat_sanity. Also store supported map features...

diff --cc qcsrc/common/mapinfo.qc
index 23de32c7ca1767aecb8adc9f92f3fd5a961335d0,dce55aa86e07c9b9c1cb4135d36c8acdbd508005..26eb8e4b60f64c3dd85d2c66cec13ca5d9448c53
--- 1/qcsrc/common/mapinfo.qc
--- 2/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@@ -611,10 -589,9 +611,10 @@@ void _MapInfo_Map_ApplyGametypeEx(strin
        }
  }
  
- Gametype MapInfo_Type_FromString(string gtype)
+ Gametype MapInfo_Type_FromString(string gtype, bool dowarn)
  {
        string replacement = "";
 +      bool do_warn = true;
        switch (gtype)
        {
                case "nexball":   replacement = "nb"; break;

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

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