Catch stderr as well as stdout
Merge pull request #2441 from torcolvin/master

Catch stderr as well as stdout