Merge branch 'cm' into HEAD

Conflicts:
	cm.mk

Change-Id: Ibfdc07b924e9cd1abbcc9b71e4d4ca9527d18206
Signed-off-by: DHOMD <DHO@dho.im>