merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 13 Jul 2015 08:20:22 +0000 (08:20 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 13 Jul 2015 08:20:22 +0000 (08:20 +0000)

Trivial merge