Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 5 Jun 2019 16:39:19 +0000 (18:39 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 5 Jun 2019 16:39:19 +0000 (18:39 +0200)

Trivial merge