Pin down coverage version in gcoverage
merge upstream/master