d1607d0d

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into email-auth