02137eca

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/email-auth' into email-auth