5d2e3110

By: Michael Lynch <git@mtlynch.io>

Merge origin/master into slice-1