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

Conflicts:
	DirectVolume.h

Change-Id: I9021c065f4dca7cd6da2defb40e305a7d49645f1