ae1a2f48

By: Michael Lynch <git@mtlynch.io>

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

# Conflicts:
#	handlers/media_edit.go