Merge branch 'development' into 'master'

Development

See merge request !142
1 job for master in 5 minutes and 15 seconds (queued for 3 seconds)
latest
Status Name Job ID Coverage
  Test
passed django-tests #44411
ubuntu regular

00:05:15