e0cd577b

By: Michael Lynch <git@mtlynch.io>

Merge master into shared-secret-auth

Bring the current branch up to date with local master and resolve the user ID test helper conflict.