Merge pull request #2797 from colemanw/master