Merge commit 'ac63592a80d6d316b52b51941434e15feadb0699' into 784224-2

Conflicts:
	lib/sdk/tabs/tab-fennec.js
	lib/sdk/tabs/utils.js
	test/test-page-mod.js