Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge pull request #2 from cristianomatos/cm-11.0

Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0