Merge remote branch 'cm/cm-10.1' into cm-10.1

Conflicts:

	rootdir/init.rc