Merge branch 'plain' into build-msvc

Merge revision: r672
Conflicts:
	AviUtl/colorspace.c
	AviUtl/colorspace_simd.c