Applying last changes from cyberdelia/django-pipeline