Merge branch 'beta' into 'master'

Various fixes

See merge request !133
3 jobs for v1.0.2 in 11 minutes and 53 seconds (queued for 2 seconds)
latest
Status Name Job ID Coverage
  Test
passed py37-django22 #24054

00:09:47

94.0%
passed py38-django22 #24053

00:10:09

94.0%
 
  Quality Assurance
passed linters #24055

00:01:43