Merge upstream changes up to dd5379271410219de0806bb33e7cdfa427ea6988 #1466

Job	Run time
build (production)	4m 23s
build (test)	3m 50s
Libvips tests (3.1)	1m 31s
test (3.1)	6m 31s
Libvips tests (3.2)	1m 21s
End to End testing (3.1)	2m 18s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 17s
test (3.2)	6m 21s
Libvips tests (.ruby-version)	1m 59s
End to End testing (3.2)	2m 20s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 24s
test (.ruby-version)	6m 31s
End to End testing (.ruby-version)	2m 25s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 15s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 23s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 27s
	56m 16s

Provide feedback