3696999a

By: Michael Lynch <git@mtlynch.io>

Merge master into slice-3