Merge commit 'ee0d75aa746cf90eb4182a8651af43c9e6916bfc' into 7mod

Conflicts:
	common/common.c