Merge branch 'master' into mario/monsters

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/server/g_world.qc
index 31a72537f90ebf2b48b8b20dc2ef5f9fadae1180,680afbc8909a2ffeaa9d3880a0bf48f5ad16aba6..0fac81d85a9a949d2b7e887acaa9c17edd3b6f5f
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -954,13 -939,9 +954,11 @@@ void spawnfunc_worldspawn (void
        // weird mutators that deserve to count as mod
        if(autocvar_g_minstagib)
                modname = "MinstaGib";
 +      if(autocvar_g_monsters)
 +              modname = "Monsters";
        // extra mutators that deserve to count as mod
        MUTATOR_CALLHOOK(SetModname);
-       // weird game types that deserve to count as mod
-       if(g_cts)
-               modname = "CTS";
+ 
        // save it for later
        modname = strzone(modname);