Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 17 Jul 2019 09:48:36 +0000 (11:48 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 17 Jul 2019 09:48:36 +0000 (11:48 +0200)

Trivial merge