Merge branch 'develop' into termSearch
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 18 Feb 2019 09:30:41 +0000 (10:30 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 18 Feb 2019 09:30:41 +0000 (10:30 +0100)

Trivial merge