game.containsLocation takes World into account
Merge remote-tracking branch 'origin/master'