Merge branch 'patch-moore943-error' into 'master'

Follow Moore!943

See merge request !45
2 jobs for master in 16 seconds