92a09fa3

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/master' into edit-media