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