[editor] more fixes webnotes/erpnext#1011
Merge branch 'master' of github.com:webnotes/wnframework