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

Conflicts:
	gosu-core-api/pom.xml