Merge change Ic2680af0 into eclair

* changes:
  Cleanup for coverage.