Ensure process exit code is preserved when using --no-exit
Merge pull request #1059 from glenjamin/master

Ensure process exit code is preserved when using --no-exit