Merge pull request #2 from CyanogenMod/cm-11.0

Merge latest commit.