Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Mon, 2 Sep 2019 20:37:27 +0000 (22:37 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Mon, 2 Sep 2019 20:37:27 +0000 (22:37 +0200)

Trivial merge