Merge branch 'cm-11.0' of github.com:CyanogenMod