Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 26 Oct 2016 08:05:03 +0000 (10:05 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 26 Oct 2016 08:05:03 +0000 (10:05 +0200)

Trivial merge