Commit a5d5e546 authored by Alexander Orvik's avatar Alexander Orvik

Merge branch 'develop' into 'master'

hotfix/master-dev-conflict

See merge request !40
parents 86593425 1a422edd
Pipeline #50406 passed with stages
in 2 minutes and 37 seconds