Edit for Mozilla
Merge branch 'master' of https://github.com/dannypranoto/bahamut