Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Thu, 12 Nov 2020 16:30:40 +0000 (17:30 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 12 Nov 2020 16:30:40 +0000 (17:30 +0100)

Trivial merge