By: Michael Lynch <git@mtlynch.io>
Merge master into email-auth Preserve real SMTP login email behavior while adopting master's redirect-path and auth flow changes.