Merge pull request #85 from magento/master

Update develop branch