Fix for django-cms issue 1634