Magento core
Merge branch 'master' of https://github.com/badelas/magento