Merge pull request #6405 from akallabeth/an-stable-2.0
authorMartin Fleisz <martin.fleisz@thincast.com>
Wed, 5 Aug 2020 10:21:48 +0000 (12:21 +0200)
committerGitHub <noreply@github.com>
Wed, 5 Aug 2020 10:21:48 +0000 (12:21 +0200)
stable 2.0 backports


Trivial merge