Update to latest django
Merge branch 'master' into feature/es
Fix #85 again