Merge remote-tracking branch 'origin/master'

Conflicts:
	src/game.js
	src/scenes.js
We specifically do NOT want to run() if we've passed time - we'll let pass_time decide what should happen next.