Commit 1cf6fd11 authored by Carsten  Rose's avatar Carsten Rose

Merge branch 'develop' into 'master'

Develop

See merge request !233
parents 55163328 48dda007
Pipeline #3105 passed with stages
in 1 minute and 54 seconds