7514cc1e

By: Michael Lynch <git@mtlynch.io>

Merge origin/master into delete-media/3/delete-files