Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Mon, 28 Dec 2020 15:30:06 +0000 (16:30 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 28 Dec 2020 15:30:06 +0000 (16:30 +0100)

Trivial merge