Merge pull request #2991 from colemanw/master