Merge remote branch 'origin/master' into samual/keepaway

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/util.qc
index 8c87b7fdad4f0e81a26e66633d9bb9032c7020a8,8c87b7fdad4f0e81a26e66633d9bb9032c7020a8..823709c9505c83482e85636d6339159b083d480e
--- 1/qcsrc/common/util.qc
--- 2/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -439,6 -439,6 +439,7 @@@ string GametypeNameFromType(float g
        else if (g == GAME_RACE) return "rc";
        else if (g == GAME_NEXBALL) return "nexball";
        else if (g == GAME_CTS) return "cts";
++      else if (g == GAME_KEEPAWAY) return "ka";
        return "dm";
  }
  

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
Simple merge