Merge branch 'split-stdout-and-stderr'