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 #1645265
test

00:01:23

passed #1645266
test-coverage

00:01:58

92.0%
passed #1645267
test-docs

00:00:44