Merge branch 'master' into msvc-warn-audit
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Mon, 9 Sep 2019 18:16:52 +0000 (20:16 +0200)
committerGitHub <noreply@github.com>
Mon, 9 Sep 2019 18:16:52 +0000 (20:16 +0200)

Trivial merge