Comment 1 for bug 884229

I can confirm that the fix works. I have just proposed a merge containing Xiao-Long Chen's fix.