Merge pull request #1 from adobe/master

Sync with origin