Merge pull request #1 from mozilla-b2g/master

Updating from Parent