Merge commit 'refs/pull/1801/head' of https://github.com/magento/magento2 into MAGETWO-42617
Conflicts: app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
Please register or sign in to comment
Conflicts: app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml