Backported fix for bug 281446 to 3.5 maintenance.
1 file changed