Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Fri, 29 Jan 2021 15:23:00 +0000 (16:23 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 29 Jan 2021 15:23:00 +0000 (16:23 +0100)

Trivial merge