Merge branch 'cyanogenmod' into cm-10.2