Merge branch 'next' into formBuilder
authorMatthias Schmidt <gravatronics@live.com>
Fri, 27 Jul 2018 07:32:04 +0000 (09:32 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 27 Jul 2018 07:32:04 +0000 (09:32 +0200)

Trivial merge