upgrade Django to get security fixes
Merge branch 'master' into release