Merge pull request #124 from magento/develop

Merge pull request #123 from magento/master