Merge remote-tracking branch 'cyanogen/cm-10.1' into mr1-staging