Merge/mastodon main branch #1864

Job	Run time
build (production)	4m 59s
build (test)	3m 56s
Libvips tests (3.2)	5m 6s
test (3.2)	6m 5s
End to End testing (3.2)	7m 11s
Libvips tests (3.3)	5m 5s
test (3.3)	6m 10s
Elastic Search integration testing (3.2, 7.17.24, docker.elastic.co/elasticsearch/elasticsearch:7...	6m 36s
End to End testing (3.3)	8m 5s
Libvips tests (head)	5m 7s
test (head)	6m 38s
Elastic Search integration testing (3.3, 7.17.24, docker.elastic.co/elasticsearch/elasticsearch:7...	5m 28s
End to End testing (head)	4m 54s
Elastic Search integration testing (head, 7.17.24, docker.elastic.co/elasticsearch/elasticsearch:...	3m 39s
	1h 18m 59s

Provide feedback