Merge branch 'master' into issue1216/IgnoreEmacsRecoveryFiles
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Mon, 9 Sep 2019 19:46:39 +0000 (21:46 +0200)
committerGitHub <noreply@github.com>
Mon, 9 Sep 2019 19:46:39 +0000 (21:46 +0200)

Trivial merge