Possible fix for CRM-12589
Merge pull request #794 from colemanw/tinymce

Possible fix for CRM-12589