Commit 0b03330a authored by Willi Rath's avatar Willi Rath

Merge branch 'develop' into 'master'

Develop

See merge request !64
parents 1ac1ae7e 54fb092e
Pipeline #1296 passed with stage
in 30 minutes and 31 seconds