Merge branch 'develop' into unify_derivative_views
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 7 Oct 2015 15:40:54 +0000 (17:40 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 7 Oct 2015 15:40:54 +0000 (17:40 +0200)

Trivial merge