Fix #37
Merge branch 'devel' of https://github.com/go-gl/glfw3 into devel