oops
Merge remote-tracking branch 'origin/master'

Conflicts:
	libvips/histogram/maplut.c