6b3caf88

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into slice-1