Merge remote-tracking branch 'upstream/master'
Merge pull request #115 from magento/master

Merge remote-tracking branch 'upstream/master'