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