Fix merge issue
Merge branch 'java8' of github.com:gosu-lang/gosu into java8