Rename GLFW callback helper methods
Fix javadoc link
Merge remote-tracking branch 'upstream/master' into travis-osx