Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Wed, 13 Sep 2017 15:32:30 +0000 (17:32 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 13 Sep 2017 15:32:30 +0000 (17:32 +0200)

Trivial merge