weekly update 2

A lot of changes.
Merge remote-tracking branch 'upstream/jellybean' into jellybean