merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 19 Jun 2014 12:47:43 +0000 (12:47 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 19 Jun 2014 12:47:43 +0000 (12:47 +0000)

Trivial merge