TINY-2874: check in wip to merge master into branch
TINY-2874: check in wip to merge master into branch

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