Land bug 950452. r=jandem

--HG--
extra : rebase_source : 43f49a241cd6553bd4160df3bc9c316c64fbc746