Merge branch 'devel' into 'testing'

cosmetic

See merge request !149
1 job for testing in 15 seconds