Merge from mozilla-b2g/master