Merge branch 'master' into Mario/duel

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

diff --cc qcsrc/server/bot/default/bot.qc
index 10ececff6362a3964c13d9c4c3ea181e536bc671,2a6164a2826875af507597ba8523bf629bee0403..ec84e55167618aea25811a9242963c40a5e22c52
--- 1/qcsrc/server/bot/default/bot.qc
--- 2/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@@ -593,10 -593,7 +593,8 @@@ float bot_fixcount(
                });
        }
  
 +      //int player_limit = GetPlayerLimit(); // TODO: use this instead of maxclients!
        int bots;
-       // add/remove bots if needed to make sure there are at least
-       // minplayers+bot_number, or remove all bots if no one is playing
        // But don't remove bots immediately on level change, as the real players
        // usually haven't rejoined yet
        bots_would_leave = false;

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

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

diff --cc qcsrc/server/compat/quake3.qc
Simple merge

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