Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Tue, 24 Sep 2019 09:26:59 +0000 (11:26 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Tue, 24 Sep 2019 09:26:59 +0000 (11:26 +0200)

Trivial merge