Backported bug 156448 to 3.2.1
1 file changed