f27e078e

By: Michael Lynch <git@mtlynch.io>

Merge master into not-real-email

Preserve the magic-link login flow on the feature branch while applying master changes that still fit the current branch.