Merge pull request #2445 from colemanw/4.4