Adding support for code coverage.
Merge branch 'master' into TermWriter