Commit 2238514b authored by Jens Reidel's avatar Jens Reidel

Merge branch 'next' into 'current'

updates from next

See merge request !667
parents 01ab77d2 f8170615
Pipeline #2057 canceled with stages