Fix 3589 for 3.0.x

https://github.com/divio/django-cms/issues/3589 for details.

This pull request is for support/3.0.x branch if it is possible to be released before 3.1