Merge 'master' into 'tinymce-attempt' with 'ours' strategy
'tinymce-attempt' becomes the new 'master' branch