Merge pull request #2133 from colemanw/master