Merge pull request #123 from magento/master

Merge pull request #122 from magento/develop
Merge pull request #124 from magento/develop

Merge pull request #123 from magento/master