Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Wed, 18 Nov 2020 15:28:34 +0000 (16:28 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 18 Nov 2020 15:28:34 +0000 (16:28 +0100)

Trivial merge