01dbe601

By: Michael Lynch <git@mtlynch.io>

Merge master into delete-media/1/show-delete-option