Merge branch 'develop' into wset
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 10 Jan 2018 11:43:27 +0000 (12:43 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 10 Jan 2018 11:43:27 +0000 (12:43 +0100)

Trivial merge