Merge pull request #2063 from colemanw/4.4