fc01a55d

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into email-auth

# Conflicts:
#	.env.example