Merge pull request #2 from mozilla/master

Merged from upstream