merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 11 Aug 2014 12:28:34 +0000 (12:28 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 11 Aug 2014 12:28:34 +0000 (12:28 +0000)

Trivial merge