8c921866

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into shrink-handlers