Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	src/components/script/dom/bindings/proxyhandler.rs
	src/components/script/dom/bindings/text.rs
Rebase and update submodules