Merge remote-tracking branch 'upstream/master'
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Fri, 6 Sep 2019 19:00:37 +0000 (21:00 +0200)
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Fri, 6 Sep 2019 19:00:37 +0000 (21:00 +0200)

Trivial merge