Updated by ALF automation.
Update to Sprint 20
Updated by ALF automation.
Merge pull request #2635 from adobe/jasonsanjose/sprint-20-version

Update to Sprint 20
Merge branch 'master' into alf

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

Updated by ALF automation.