Merge pull request #6152 from akallabeth/stable-backports 2.1.0
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Fri, 8 May 2020 09:40:17 +0000 (11:40 +0200)
committerGitHub <noreply@github.com>
Fri, 8 May 2020 09:40:17 +0000 (11:40 +0200)
Stable backports


Trivial merge