Merge commit '28314e7a9a3c3ebfcc4db8e9f1875507063ae6e6' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 19 Jun 2019 11:04:01 +0000 (13:04 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 19 Jun 2019 11:04:01 +0000 (13:04 +0200)

Trivial merge