Merge remote-tracking branch 'razrq/cm-10.1' into cm-10.2