Merge branch 'ticket#6694' into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 7 Jun 2017 10:02:56 +0000 (12:02 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 7 Jun 2017 10:02:56 +0000 (12:02 +0200)

Trivial merge