Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix-0.24.x
Merge branch 'hotfix-0.24.x' of github.com:alohaeditor/Aloha-Editor into hotfix-0.25.x