• Merge remote-tracking branch 'upstream/master' into window 

    Conflicts:
	components/compositing/headless.rs
	components/script/dom/window.rs
    @farodin91
    farodin91 committed Sep 1, 2015
    Loading status checks…
    f655800