Merge remote-tracking branch 'remotes/origin/plain' into master+mod

Conflicts:
	configure
	output/mp4.c
	x264.c
	x264.h
Level force
Profile force