Bug 1085526, prep for Firefox 33.0.1, r=rail
Merge default --> production

--HG--
branch : production