Merge branch 'editing' into include-empty-submitlog

Conflicts:
src/scripts/modules/media/editbar/modals/publish.coffee