Merge branch 'development' into 'issue/172'

# Conflicts:
#   src/adega/settings.py
1 job for issue/172 in 2 minutes and 7 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #35347
regular ubuntu
django-tests

00:02:07