Merge branch 'master' into fix-delete-base-folders-instr
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Thu, 9 Jul 2020 19:38:11 +0000 (21:38 +0200)
committerGitHub <noreply@github.com>
Thu, 9 Jul 2020 19:38:11 +0000 (21:38 +0200)

Trivial merge