Bug 1035395. r=smaug,bholley. a=abillings

--HG--
extra : rebase_source : d2b010e4b1a740100dd1bb4b64c9b289fa2cdebb