Merge branch '2.1' into 3.0 3.0.final
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:36:12 +0000 (13:36 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:36:12 +0000 (13:36 +0100)

Trivial merge