Merge branch 'plain' into 7mod

Conflicts:
	x264.c