c40f4f06

By: Michael Lynch <git@mtlynch.io>

Merge origin/master into delete-media/2/delete-media