Merge branch 'hotfix/hotfix'
Textarea WYSIHTML5
Merge branch 'hotfix/hotfix' into develop