Merge/mastodon main branch #1739

Job	Run time
build (production)	2m 48s
build (test)	3m 18s
test (3.1)	6m 41s
End to End testing (3.1)	6m 15s
test (3.2)	5m 43s
Elastic Search integration testing (3.1, 7.17.15, docker.elastic.co/elasticsearch/elasticsearch:7...	4m 3s
End to End testing (3.2)	5m 33s
Libvips tests (3.1)	1m 52s
Elastic Search integration testing (3.2, 7.17.15, docker.elastic.co/elasticsearch/elasticsearch:7...	3m 36s
test (3.3)	6m 27s
End to End testing (3.3)	5m 54s
Libvips tests (3.2)	1m 52s
Elastic Search integration testing (3.3, 7.17.15, docker.elastic.co/elasticsearch/elasticsearch:7...	3m 34s
test (head)	7m 3s
End to End testing (head)	5m 6s
Libvips tests (3.3)	2m 1s
Elastic Search integration testing (head, 7.17.15, docker.elastic.co/elasticsearch/elasticsearch:...	3m 29s
Libvips tests (head)	2m 6s
	1h 17m 21s

Provide feedback