Merge branch 'devel' into 'testing'

minor fix

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