pull request for merging latest cm11 changes

lets see if this goes smoothly