Commit 0dd441f4 authored by Alexander Orvik's avatar Alexander Orvik

Merge branch 'develop' into 'master'

Final version

See merge request !32
parents 251aaa16 673a8b18
Pipeline #50156 passed with stages
in 2 minutes and 31 seconds