synced to Perforce Change 550532
Merge branch 'fromP4' of github.com:gosu-lang/gosu