Merge pull request #11752 from colemanw/CKEditor