Merge pull request #85 from magento/master

Update develop branch
Merge pull request #86 from magento/develop

Merge pull request #85 from magento/master