Mitigating #9 - Tons of firefox fixes