Merge branch 'updates'
ckeditor image deleted
Merge branch 'master' into updates