Merge branch 'develop' into termSearch
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 26 Feb 2019 13:57:21 +0000 (14:57 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 26 Feb 2019 13:57:21 +0000 (14:57 +0100)

Trivial merge