Manual merge of Pull Request #1 by @MozillaFirehax