Merge pull request #122 from magento/develop

merge develop with master
Merge pull request #123 from magento/master

Merge pull request #122 from magento/develop