Make consistent with Team Deathmatch
Merge branch 'master' of https://github.com/UltimateGames/deathmatch