Bug 1085175. r=roc, a=2.0+

--HG--
extra : rebase_source : b2fa404fce778a370a6381107a4f6bcb30b13907