Merge pull request #1 from mozilla/master

Update