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

Trivial merge