Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 26 Jun 2019 19:19:17 +0000 (21:19 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 26 Jun 2019 19:19:17 +0000 (21:19 +0200)

Trivial merge