Merge branch 'patch-1' into 'testing'

Patch 1

See merge request !73
1 job for testing in 6 seconds (queued for 4 seconds)