Merge branch 'master' into 117-django-2-2-not-compatible-with-psycopg-2-9

2 jobs for 117-django-2-2-not-compatible-with-psycopg-2-9 in 25 minutes and 8 seconds (queued for 48 seconds)