e85f24ad

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into backport/little-moments-1cb203e