a14acfa1

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into shared-secret-auth