Merged pull request #18 manually
Automated merge with ssh://bitbucket.org/ned/coveragepy