Brought Cyanogenmod 10.1 branch up to date with Cyanogenmod 11