Merge branch 'v1.3' into v1.3t
Merge branch 'v1.3t' of https://github.com/mozilla-b2g/gaia into v1.3t