Merge pull request #6680 from colemanw/cleanup