Merge branch that installs coverage during buildout and makes it work again.