Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Sun, 6 Oct 2019 23:41:26 +0000 (01:41 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Sun, 6 Oct 2019 23:41:26 +0000 (01:41 +0200)

Trivial merge