2358b732

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into not-real-email

# Conflicts:
#	e2e/fixtures.ts
#	handlers/templates/pages/login.html