Merge branch 'master' into quit-wizard-fix
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Wed, 16 Oct 2019 03:19:21 +0000 (05:19 +0200)
committerGitHub <noreply@github.com>
Wed, 16 Oct 2019 03:19:21 +0000 (05:19 +0200)

Trivial merge