Fix lcov test failures
Merge branch 'master' into geezer