Patched bug 1017011
Patched bug 1017016