Merge in latest glfw:master