4f4455d1

By: Michael Lynch <git@mtlynch.io>

Merge origin/master into slice-2.5