TinyMCE Update
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from solispauwels/master

TinyMCE Update