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