Merge commit 'refs/pull/1389/head' of https://github.com/magento/magento2 into MAGETWO-39123-new
Conflicts: app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
Please register or sign in to comment
Conflicts: app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php