Merge branch 'hotfix/release-1.3'
Fixed ICME flag in Wysiwyg (again)
Merge branch 'hotfix/release-1.4' into develop