Fixed Issue #1212
Fixed Issue #1212
Merge branch 'develop' into patch-2
Merge branch 'develop' of github.com:divio/django-cms into patch-2