Merge branch 'next' into pipGui
authorMatthias Schmidt <gravatronics@live.com>
Sun, 9 Sep 2018 13:26:49 +0000 (15:26 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 9 Sep 2018 13:26:49 +0000 (15:26 +0200)

Trivial merge