Merge pull request #6773 from remitamine/airmozilla