Merge pull request #1 from LokeyCoding/magento-1.7

Magento 1.7