Merged from sub repository (updated ckeditor, filters - step 3)
Release commit