Merge branch 'plain' into lsmash+mod

Conflicts:
	version.sh
	x264.c