Fixed a bug that caused new players joining during a Freeze game to spawn outside of the map
Merge remote-tracking branch 'origin/freeze' into freeze