Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Fri, 27 Mar 2020 16:08:16 +0000 (17:08 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 27 Mar 2020 16:08:16 +0000 (17:08 +0100)

Trivial merge