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

Trivial merge