Merge trunk into branch
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 28 Apr 2016 09:25:24 +0000 (11:25 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 28 Apr 2016 09:25:24 +0000 (11:25 +0200)

Trivial merge