Merge pull request #3990 from charris/backport-1.8-3989

backport-1.8-3989