Merge branch 'master' into master
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Wed, 26 Aug 2020 23:12:30 +0000 (01:12 +0200)
committerGitHub <noreply@github.com>
Wed, 26 Aug 2020 23:12:30 +0000 (01:12 +0200)

Trivial merge