Merge branch 'next' into pipGui
authorMatthias Schmidt <gravatronics@live.com>
Wed, 17 Oct 2018 17:40:08 +0000 (19:40 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 17 Oct 2018 17:40:08 +0000 (19:40 +0200)

Trivial merge