Merge pull request #5171 from colemanw/cleanup