Merge branch 'dev' into b2g