coverage, closes #1524
merge conflict
Merge pull request #1554 from spumko/1524/coverage

coverage, closes #1524