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

Trivial merge