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