Merge branch 'firefox' into gh-pages