merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 4 Nov 2014 09:41:17 +0000 (09:41 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 4 Nov 2014 09:41:17 +0000 (09:41 +0000)

Trivial merge