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 Job ID Name Coverage
  Test
passed #9744
py37-django22

00:09:47

94.0%
passed #9745
py38-django22

00:10:09

94.0%
 
  Quality Assurance
passed #9746
linters

00:01:43