Merge pull request #728 from mbethke/test-and-clean