Merge branch 'devel' into 'master'

Work on tests - esp. for Django 3 compatibility

See merge request !159
4 jobs for master in 7 minutes and 54 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #4708
pycco

00:06:11

passed #4707
test_and_coverage

00:07:19

71.0%
 
  Deploy
passed #4709
pages

00:00:35

passed pages:deploy

00:00:01