Merge branches 'patch-1' and 'exit-value'