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 Name Job ID Coverage
  Test
passed test #1640321

00:00:39

passed test-coverage #1640358

00:01:41

92.0%
passed test-docs #1640359

00:00:33

failed test-coverage #1640322

00:00:29

failed test-docs #1640323

00:00:29