Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Mon, 7 May 2018 17:18:39 +0000 (19:18 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 7 May 2018 17:18:39 +0000 (19:18 +0200)

Trivial merge