1a97c652

By: Michael Lynch <git@mtlynch.io>

Merge master into slice-0.5