merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 29 Jun 2015 13:25:18 +0000 (13:25 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 29 Jun 2015 13:25:18 +0000 (13:25 +0000)

Trivial merge