Upgrade Django for security fixes
Merge branch 'master' into develop

* master:
  Upgrade Django for security fixes