Merge pull request #1 from CyanogenMod/cm-11.0