fixes django-pipeline problems
merge