Merge branch 'develop' into termSearch
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 20 Feb 2019 14:23:43 +0000 (15:23 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 20 Feb 2019 14:23:43 +0000 (15:23 +0100)

Trivial merge