merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 13 Oct 2014 11:51:58 +0000 (11:51 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 13 Oct 2014 11:51:58 +0000 (11:51 +0000)

Trivial merge