Merge branch 'devel' into 'devel'

update devel

See merge request !12
6 jobs for devel in 96 minutes and 23 seconds (queued for 6 seconds)
latest