Pull changes from riklaunim/django-ckeditor.