merge from ckeditor 4.3