Merge branch 'develop' into detailsE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 10 Aug 2017 14:36:17 +0000 (16:36 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 10 Aug 2017 14:36:17 +0000 (16:36 +0200)

Trivial merge