Merge mastodon main branch #1850

Job	Run time
build (production)	4m 58s
build (test)	2m 58s
Elastic Search integration testing (3.2, 7.17.24, docker.elastic.co/elasticsearch/elasticsearch:7...	5m 37s
End to End testing (3.2)	7m 50s
test (3.2)	7m 1s
Elastic Search integration testing (3.3, 7.17.24, docker.elastic.co/elasticsearch/elasticsearch:7...	5m 42s
Libvips tests (3.2)	4m 56s
End to End testing (3.3)	7m 23s
test (3.3)	6m 32s
Elastic Search integration testing (head, 7.17.24, docker.elastic.co/elasticsearch/elasticsearch:...	3m 43s
Libvips tests (3.3)	5m 13s
End to End testing (head)	5m 4s
test (head)	7m 6s
Libvips tests (head)	6m 1s
	1h 20m 4s

Provide feedback