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)
commit8f3e7aa3730af14a2b693b3ef0bd093d8f2aef82
treecc375bd3ede34346142c8c905e7bd75e2b7c3910
parent584efae073386e8c5f6bc265b05c87d508a9bcbc
parentda3caff12ab7764db34ee8c10aa67d42a617aa22
Merge pull request #6319 from akallabeth/stable-2.0-backports3

Stable 2 backports from master