Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'mokee/jb-mr1_mkt' into HEAD