3.57
Merge remote-tracking branch 'upstream/jellybean' into jellybean