Merge branch 'develop' into gun

diff --cc lib/mix/tasks/pleroma/benchmark.ex
Simple merge

diff --cc lib/pleroma/http/connection.ex
Simple merge

diff --cc lib/pleroma/http/http.ex
Simple merge

diff --cc lib/pleroma/http/request_builder.ex
Simple merge

diff --cc lib/pleroma/reverse_proxy/client.ex
Simple merge

diff --cc lib/pleroma/reverse_proxy/reverse_proxy.ex
Simple merge

diff --cc lib/pleroma/web/web_finger/web_finger.ex
Simple merge

diff --cc test/http_test.exs
Simple merge

diff --cc test/reverse_proxy/reverse_proxy_test.exs
Simple merge

diff --cc test/user_invite_token_test.exs
Simple merge