Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 18 Sep 2016 08:06:26 +0000 (10:06 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 18 Sep 2016 08:06:26 +0000 (10:06 +0200)

Trivial merge