Merge branch 'devel' into 'devel'

update devel

See merge request !12
9 jobs for devel in 87 minutes and 48 seconds (queued for 4 seconds)
latest