Updated by ALF automation.
Merge branch 'master' into alf

Conflicts:
	src/nls/fr/strings.js
	src/nls/ja/strings.js
Merge pull request #3587 from adobe/alf

ALF Automation