Merge branch 'master' into rakekniven-patch-1
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Fri, 4 Oct 2019 22:04:39 +0000 (00:04 +0200)
committerGitHub <noreply@github.com>
Fri, 4 Oct 2019 22:04:39 +0000 (00:04 +0200)

Trivial merge