Merge master into servo for glfw 3.0.4 merge

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