Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 24 Nov 2019 16:57:44 +0000 (17:57 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 24 Nov 2019 16:57:44 +0000 (17:57 +0100)

Trivial merge