fixed
Merge branch 'refs/heads/hotfix-email-subscribe-fb-login'