Merge pull request #1876 from colemanw/4.4