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