divio/django-cms — pull request #2701 by yakky (2014-02-23 14:30:27+00:00)
Title: Forward porting of #1128 by @kezabelle. Still some tests failing.

Port of #1128
Fix #1120