Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 22 Feb 2020 15:55:31 +0000 (16:55 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 22 Feb 2020 15:55:31 +0000 (16:55 +0100)

Trivial merge