Merged in feature branch stderr-capture (works ok)