Merge remote-tracking branch 'upstream/master' into window …
Conflicts: components/script/dom/window.rs
