Manually merge r67868 from 2.6 branch.
1 file changed