Automated merge with https://bitbucket.org/wkornewald/django-mediagenerator
Automated merge with https://bitbucket.org/wkornewald/django-mediagenerator

potatolondon/django-mediagenerator,stucchio/Django-Media-Generator,potatolondon/django-mediagenerator,stucchio/Django-Media-Generator,potatolondon/django-mediagenerator