Merge in coveralls fix