By: Michael Lynch <git@mtlynch.io>
Merge master into email-auth Keep the magic-link authentication flow from email-auth while bringing in the local master branch updates.