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

Trivial merge