Merge branch 'master' into rc1.3.7

Conflicts:
	app-manifest.json
	package.json