Merge branch 'firefox-fixes' into testfixes-for-firefox