a31e8282cb
(cherry picked from commit 2d19729869)
# Conflicts:
# core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt