merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Jun 2014 08:02:16 +0000 (08:02 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Jun 2014 08:02:16 +0000 (08:02 +0000)

Trivial merge