By: Michael Lynch <git@mtlynch.io>
Merge master into email-auth Bring the branch up to date with master and reconcile the email-auth tests with the injected SQLite clock API.