fix ckeditor
Merge commit '4a2d85cfdc1284570da25fbfd768b424f324f1c3'