resistance is futile
Merge branch 'develop' of github.com:divio/django-cms into develop