Merge branch 'master' into improve-ci
authorShinigami <chrissi92@hotmail.de>
Mon, 8 Feb 2021 18:11:15 +0000 (19:11 +0100)
committerGitHub <noreply@github.com>
Mon, 8 Feb 2021 18:11:15 +0000 (19:11 +0100)

Trivial merge