Merge branch 'patch-133' into 'master'

team25

See merge request !173
2 jobs for master in 15 seconds (queued for 2 seconds)