Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw