Merge upstream changes up to 1fc165de02d79294c8a218f5fa82bcd477484ca1 #1667

Job	Run time
build (production)	4m 35s
build (test)	4m 8s
Libvips tests (3.1)	3m 47s
test (3.1)	7m 5s
End to End testing (3.1)	4m 4s
Libvips tests (3.2)	3m 36s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 5s
test (3.2)	6m 27s
End to End testing (3.2)	4m 15s
Libvips tests (.ruby-version)	3m 51s
test (.ruby-version)	8m 6s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 4s
End to End testing (.ruby-version)	2m 29s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 13s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 52s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	2m 56s
	1h 9m 33s

Provide feedback