merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 13 Aug 2014 09:26:27 +0000 (09:26 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 13 Aug 2014 09:26:27 +0000 (09:26 +0000)

Trivial merge