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

Conflicts:
	gosu-parent/pom.xml