Commit 5486fe2c authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

Marge latest devel into master

See merge request !141
parents 02aba96a f86c9bae
Pipeline #1467 passed with stage
in 11 minutes and 28 seconds