CM10.1 Updates from last CM Kernel.
Merge branch 'master', remote-tracking branch 'dori/master'