Merge upstream glfw 3.0.4 to master

This merge is necessary to fix https://github.com/mozilla/servo/issues/2363. r? @larsbergstrom