Magento 1.9 setup
Merge branch 'develop'