Merge pull request #122 from magento/develop

merge develop with master