Merge branch 'feature/#7531' into develop
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Fri, 6 Jul 2018 13:14:54 +0000 (15:14 +0200)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Fri, 6 Jul 2018 13:14:54 +0000 (15:14 +0200)

Trivial merge