new editor
Merge branch 'master' into release
release 0.9.11