Merge branch 'devel' into 'testing'

Devel

See merge request !6
1 job for testing in 12 seconds (queued for 1 second)