merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 5 Aug 2014 12:12:40 +0000 (12:12 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 5 Aug 2014 12:12:40 +0000 (12:12 +0000)

Trivial merge