Merge pull request #2886 from colemanw/4.4