Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Tue, 1 Oct 2019 07:38:25 +0000 (09:38 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Tue, 1 Oct 2019 07:38:25 +0000 (09:38 +0200)

Trivial merge