Merge PR #13179 via local branch.
authorMichael Heimpold <mhei@heimpold.de>
Sun, 23 Aug 2020 20:57:08 +0000 (22:57 +0200)
committerMichael Heimpold <mhei@heimpold.de>
Sun, 23 Aug 2020 20:58:12 +0000 (22:58 +0200)

Trivial merge