merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 8 Jul 2015 12:50:55 +0000 (12:50 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 8 Jul 2015 12:50:55 +0000 (12:50 +0000)

Trivial merge