Merge branch 'master' into patch-1
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Wed, 17 Jun 2020 15:35:07 +0000 (17:35 +0200)
committerGitHub <noreply@github.com>
Wed, 17 Jun 2020 15:35:07 +0000 (17:35 +0200)

Trivial merge