Merge branch 'master' into 'rohlfing-patch-remove-pypdf2'

# Conflicts:
#   README.md
3 jobs for rohlfing-patch-remove-pypdf2 in 1 minute and 58 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed test #1645265

00:01:23

passed test-coverage #1645266

00:01:58

92.0%
passed test-docs #1645267

00:00:44