Email-confirmation-runthisinproduction
Merge branch 'Email-confirmation-runthisinproduction'

into production mode