Patch for bug 2315 and 1525 - non convergent editline with preserve block
Omitted promise status report from exception
Merge pull request #1215 from markburgess/master

Patch for bug 2315 and 1525 - non convergent editline with preserve bloc...