rose edit: fix quit
Merge branch 'master' into rose-edit.fix-premature-quit
Merge pull request #975 from benfitzpatrick/rose-edit.fix-premature-quit

rose edit: fix premature quit