Merge branch 'master' into dzsave-gsf
Merge branch 'dzsave-gsf' of github.com:jcupitt/libvips into dzsave-gsf