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

Conflicts:
	gosu-core/src/main/java/gw/internal/gosu/compiler/protocols/gosuclass/osgi/OSGiHandler.java
	gosu-core/src/main/java/gw/internal/gosu/module/fs/EquinoxURLResolver.java