• Merging and fix review

    Conflicts:
    	components/msg/compositor_msg.rs
    	components/script/dom/window.rs
    	components/script/script_task.rs
    farodin91 committed Aug 16, 2015