Merge branch 'master' into master
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Thu, 19 Sep 2019 15:05:04 +0000 (17:05 +0200)
committerGitHub <noreply@github.com>
Thu, 19 Sep 2019 15:05:04 +0000 (17:05 +0200)

Trivial merge