Fixed some TinyMCE issues.
Merged conflicts.