Merge branch 'develop' into bulkNat
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 31 May 2018 16:19:55 +0000 (18:19 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 31 May 2018 16:19:55 +0000 (18:19 +0200)

Trivial merge