fix bug 852820
Merge pull request #8723 from weideng/master

fix bug 852820 r=djf