b5c4baeb

By: Michael Lynch <git@mtlynch.io>

Merge branch 'edit-caption' into edit-media