Merge branch 'patch-1' into 'testing'

Patch 1

See merge request !22
1 job for testing in 9 seconds (queued for 3 seconds)