CancelSave needs to return to the mode it was on
Merge branch 'master' of github.com:prose/prose