Merge branch 'develop' into bulkEditorE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 26 Sep 2017 11:53:01 +0000 (13:53 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 26 Sep 2017 11:53:01 +0000 (13:53 +0200)

Trivial merge