Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Thu, 7 May 2020 14:52:53 +0000 (16:52 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 7 May 2020 14:52:53 +0000 (16:52 +0200)

Trivial merge