Print standard output on error
Merge branch 'master' of github.com:pcmanus/ccm