fuck me lots of changes need merged - merge from cm-10.1 in jellybean-cyandream