Merge branch 'next' into formBuilder
authorMatthias Schmidt <gravatronics@live.com>
Fri, 27 Jul 2018 13:48:03 +0000 (15:48 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 27 Jul 2018 13:48:03 +0000 (15:48 +0200)

Trivial merge