Merge branch 'next' into pipGui
authorMatthias Schmidt <gravatronics@live.com>
Fri, 26 Oct 2018 18:09:39 +0000 (20:09 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 26 Oct 2018 18:09:39 +0000 (20:09 +0200)

Trivial merge