Merge commits from cm-10.2 into master

Switch to master branch as default branch since were no longer "working" on cm-10.2