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

Trivial merge