Merge pull request #2054 from colemanw/4.4