merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 6 Aug 2014 07:20:47 +0000 (07:20 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 6 Aug 2014 07:20:47 +0000 (07:20 +0000)

Trivial merge