Merge branch 'devel' into 'master'

Work on tests - esp. for Django 3 compatibility

See merge request !159