Cm 10.2

Accept this pull request and sync this repo...then it should be tracking your settings repo