Merge branch 'develop' into unify_derivative_views
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 27 Oct 2015 14:35:50 +0000 (15:35 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 27 Oct 2015 14:35:50 +0000 (15:35 +0100)

Trivial merge