Merge branch 'devel' into 'testing'

cosmetic

See merge request !148
1 job for testing in 16 seconds (queued for 1 second)