Fix for issue 7714, ported from the trunk.
2 files changed