Merge pull request #2629 from colemanw/master