Merge branch 'cyanogenmod' into cm-10.1

Signed-off-by: Humberto Borba <humberos@gmail.com>