Merge branch 'master' of https://github.com/potatolondon/django-nonrel-1-4