Merge branch 'CyanogenMod/cm-11.0'
Merge branch 'origin/cm-11.0'