Merge branch 'plain' into 7mod

Conflicts:
	common/common.c
	common/x86/pixel-a.asm
	common/x86/pixel.h