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

Conflicts:
	src/nls/ja/strings.js
fix indentation
Merge pull request #2636 from adobe/alf

Updated by ALF automation.