fa00f458

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into simplify-e2e-sqlite