Merge branch 'master' of git://github.com/mozilla/addon-sdk into bug/detraitify-windows@897004

Conflicts:
	lib/sdk/tabs/utils.js
	test/addons/e10s/lib/main.js