Merge pull request #1 from Mozilla-cIT/master

Rebase