Merging back with Magento Version

Just in case anything changed.