Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Fri, 28 Jul 2017 07:33:21 +0000 (09:33 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 28 Jul 2017 07:33:21 +0000 (09:33 +0200)

Trivial merge