sync
Merge branch 'master' of github.com:jcupitt/libvips

Conflicts:
	TODO
fix up deCMC again