Merge branch 'master' into gitignore
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Thu, 5 Sep 2019 18:31:23 +0000 (20:31 +0200)
committerGitHub <noreply@github.com>
Thu, 5 Sep 2019 18:31:23 +0000 (20:31 +0200)

Trivial merge