coveralls branch=all
Merge branch 'agriffis' into all