Fix issue #142
Merge branch 'master' of github.com:kindsoft/kindeditor