Backported fix for bug 280068 to 3.5 maintenance.
2 files changed