Merge "cm: slight check on modules load" into gingerbread