Backported bug 153110 to 3.2.1.
1 file changed