Merge "fix grammatic =)" into cm-10.1