TINY-3952: Merge branch 'master' into TINY-3952
TINY-3952: Merge branch 'master' into TINY-3952

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