don't bother running an editor during merge-from
Merge branch 'develop' into develop-protoscript