Merge branch 'next' into pipGui
authorMatthias Schmidt <gravatronics@live.com>
Mon, 22 Oct 2018 18:05:24 +0000 (20:05 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 22 Oct 2018 18:05:24 +0000 (20:05 +0200)

Trivial merge