Merge commits from django-ckeditor-updated