Updated by ALF automation.
Merge branch 'master' into alf_localization
Updated by ALF automation.
Merge pull request #6225 from adobe/alf_localization

ALF Automation
Merge branch 'master' of https://github.com/adobe/brackets