merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 23 Jun 2014 10:48:11 +0000 (10:48 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 23 Jun 2014 10:48:11 +0000 (10:48 +0000)

Trivial merge