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