Merge pull request #6285 from akallabeth/stable-backports2 2.1.2
authorMartin Fleisz <martin.fleisz@thincast.com>
Mon, 22 Jun 2020 10:44:36 +0000 (12:44 +0200)
committerGitHub <noreply@github.com>
Mon, 22 Jun 2020 10:44:36 +0000 (12:44 +0200)
Stable backports


Trivial merge