Merged view changes form master branch into tinymce branch.