Backported fix for bug 279715 to 3.5 maintenance.
4 files changed