Attempt to fix undo stack
Merge branch 'master' into ice-editor