Bug 942152, r=dkeeler, r=honzab

--HG--
extra : rebase_source : 7f0bab4efa26e9c185b29fdb14d846035147fd2f