Merge pull request #2388 from colemanw/4.4