Merge remote-tracking branch 'origin/cm-11.0' into jb-7.8
Merge pull request #16 from rtfpessoa/jb-7.8

Merge remote-tracking branch 'origin/cm-11.0' into jb-7.8