cherry picked 16b4f1eeb1dfb63d4001
cherry picked 16b4f1eeb1dfb63d4001

piha/django-hvad,hds/django-hvad,philippeowagner/django-hvad,ojii/django-nani,vstoykov/django-hvad,hds/django-hvad,promil23/django-hvad,andialbrecht/django-hvad,philippeowagner/django-hvad,ojii/django-nani,piha/django-hvad,vstoykov/django-hvad,promil23/django-hvad,andialbrecht/django-hvad