Merge branch 'master' of https://github.com/mozilla-b2g/gaia into 1070845