TinyMCE update (fix issues)
Merge remote-tracking branch 'upstream/master'
Merge pull request #232 from solispauwels/master

TinyMCE update (fix issues)