Merge remote-tracking branch 'cm/cm-10.2' into HEAD
Merge pull request #1 from ProjectCodeKill/jb43

Merge remote-tracking branch 'cm/cm-10.2' into HEAD