Merge branch 'develop' into wset
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 23 Nov 2017 09:16:13 +0000 (10:16 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 23 Nov 2017 09:16:13 +0000 (10:16 +0100)

Trivial merge