Initial commit
Merge remote-tracking branch 'upstream/master' into cm-11.0