Better game.collision() error handling
Merge remote-tracking branch 'origin/master'