Merge pull request #2232 from colemanw/master