fix
Merge branch 'cm-11.0' of https://github.com/ruling/compare into cm-11.0