Merge lion:lionaro into cm-11.0