Merge remote-tracking branch 'upstream/master' into minemovie
Fix game.cpp
Merge 'upstream/master' into minemovie