Merge branch 'patch-th9v' into 'master'

change link

See merge request !68
3 jobs for master in 39 seconds