Revert "Merge branch 'refs/heads/develop'"

This reverts commit 96fe80a7fd4e627983a8a958c1ba4853b485f54c, reversing
changes made to dd28efa27f619503c962c9a25664f4098b15d5ad.
Merge branch 'master' of github.com:ndap/magento