Merge/mastodon main branch #1796

Job	Run time
build (production)	4m 45s
build (test)	3m 0s
test (3.1)	7m 19s
End to End testing (3.1)	7m 46s
Elastic Search integration testing (3.1, 7.17.15, docker.elastic.co/elasticsearch/elasticsearch:7...	6m 0s
test (3.2)	7m 44s
Libvips tests (3.1)	5m 3s
End to End testing (3.2)	8m 28s
test (3.3)	6m 51s
Elastic Search integration testing (3.2, 7.17.15, docker.elastic.co/elasticsearch/elasticsearch:7...	6m 8s
Libvips tests (3.2)	5m 6s
End to End testing (3.3)	8m 19s
Elastic Search integration testing (3.3, 7.17.15, docker.elastic.co/elasticsearch/elasticsearch:7...	6m 33s
Libvips tests (3.3)	4m 46s
End to End testing (head)	5m 52s
Elastic Search integration testing (head, 7.17.15, docker.elastic.co/elasticsearch/elasticsearch:...	4m 16s
test (head)	7m 21s
Libvips tests (head)	5m 28s
	1h 50m 45s

Provide feedback