Merge branch 'mackay-cm102' into mackay_cm102_newcwm

Conflicts:
	init/version.c

Change-Id: Ib77c29843c95747ddaa8667e035ffbf6c5cf3fa5