GLFW patch now match Camilla Berglund's commits in original branch