Change that goes along with django-cms PR #3118 and issue #3117

related to divio/django-cms#3117 and divio/django-cms#3118