a2c2a676

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into delete-media/2/delete-media