TINY-2699: Resolve merge conflict
TINY-2699: Resolve merge conflict

tinymce/tinymce,FernCreek/tinymce,TeamupCom/tinymce,tinymce/tinymce,TeamupCom/tinymce,tinymce/tinymce,FernCreek/tinymce,FernCreek/tinymce