Reapplying previous patch to new TinyMCE structure
Reapplying previous patch to new TinyMCE structure

See:
https://github.com/FernCreek/tinymce/commit/a36446be0d1be72d5d476d638f4d59934b0e45e2#diff-746814894f3d1fa1e7c8135c19191c01
https://github.com/FernCreek/tinymce/commit/ade48629dbeb34d3f1d3485f72e589f7f050b9bf#diff-746814894f3d1fa1e7c8135c19191c01

FernCreek/tinymce,FernCreek/tinymce,FernCreek/tinymce