Commit some changes to ckeditor-branch