Merge pull request #1 from xplodwild/cm-10.2

Merge commits from cm-10.2 into master