stransky pushed to firefox (f31). "Merge branch 'master' into f31"