Merge pull request #3162 from colemanw/test