Merge branch 'master' into 'rohlfing-docstring-argument-handling'

# Conflicts:
#   preparemoodle.py
5 jobs for rohlfing-docstring-argument-handling in 2 minutes and 21 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #1640321
test

00:00:39

passed #1640358
test-coverage

00:01:41

92.0%
passed #1640359
test-docs

00:00:33

failed #1640322
test-coverage

00:00:29

failed #1640323
test-docs

00:00:29