fixes #2624
Merge branch 'fix-2624' of github.com:digi604/django-cms into develop