Merge branch 'master' of git://github.com/mozilla-b2g/gaia