Merge pull request #6319 from akallabeth/stable-2.0-backports3
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Wed, 15 Jul 2020 14:42:24 +0000 (16:42 +0200)
committerGitHub <noreply@github.com>
Wed, 15 Jul 2020 14:42:24 +0000 (16:42 +0200)
Stable 2 backports from master


Trivial merge