Merge remote-tracking branch 'b2g/master' into b2g-jellybean