Django 1.7.1
Merge pull request #158 from thraxil/django-1.7.1

Django 1.7.1