Merge proposals dependent on lp:~marco-pantaleoni/sf-django-director/trunk

lp:~marco-pantaleoni/sf-django-director/trunk has no merge proposals.