Merge branch 'exit-code-bug-fix' into 'master'

Exit code bug fix

See merge request !39
3 jobs for master in 43 seconds (queued for 4 seconds)