34ed723b

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into redo-edit-caption/1/show-edit-options