Merge branch 'upgrade-django' into 44-gitlab-ci

1 job for 44-gitlab-ci in 21 seconds