improvements according to https://github.com/divio/django-cms/pull/2044