new upload of Magento core
Merge branch 'feature-newFeature2'