Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Wed, 28 Oct 2020 16:21:43 +0000 (17:21 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 28 Oct 2020 16:21:43 +0000 (17:21 +0100)

Trivial merge