Merge branch 'development' into 'master'

Sync Development and Master

See merge request adega/adega!67
1 job for 1.1.0 in 2 minutes and 16 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
passed #35390
regular ubuntu
django-tests

00:02:16