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

Conflicts:
	src/drivers/driver_wext.c

Change-Id: I0f6efd9624bc7b40dac61fff648c7141fe91aea1