Merge branch 'master' into test-addon

Conflicts:
	package.json
	test/addons/unpacked-addon/main.js