Merge pull request #1 from mozilla/master

Getting up to date