Derp
Merge branch 'jellybean' into jellybean-legacy