Updated by ALF automation.
Updated by ALF automation.
Merge branch 'master' into alf
Updated by ALF automation.
Removing duplicate string in German string file
Merge pull request #4759 from adobe/alf

ALF Automation
Merge remote-tracking branch 'origin/master' into bchin/fix-prefs-clientid-on-windows