Merge branch 'patch-1' into 'master'

Patch 1

See merge request !37
1 job for master in 5 seconds (queued for 2 seconds)