Chery-pick resolve conflict
Chery-pick resolve conflict

remik/django-page-cms,akaihola/django-page-cms,akaihola/django-page-cms,pombredanne/django-page-cms-1,remik/django-page-cms,pombredanne/django-page-cms-1,pombredanne/django-page-cms-1,batiste/django-page-cms,remik/django-page-cms,remik/django-page-cms,batiste/django-page-cms,akaihola/django-page-cms,batiste/django-page-cms