Fix fade compensation
Merge commit '3b96a2545c5b3099bdec5dca694aa51b3fd2f663' into 7mod

Conflicts:
	common/common.c