Comment 5 for bug 888815

Yes that is right. The bzr1486 was just an experimental version to check the fix worked.
It hit trunk in revision 1912 after the nightly rebuild was done yesterday. It should therefore be included tonight.