3dd793d5

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/slice-0.5' into slice-0.5