Merge pull request #1 from CyanogenMod/cm-10.2

Merge Upstream