Pulling in the recent changes from opencover