merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 1 Jul 2015 09:09:33 +0000 (09:09 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 1 Jul 2015 09:09:33 +0000 (09:09 +0000)

Trivial merge