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