Forward port patch from 2.10.11 (reported by Reed).