Merge remote-tracking branch 'forked/2.4' into upgrade-google2fa

# Conflicts:
#	composer.lock

config/app.php

@@ -185,7 +185,6 @@ return [
         GrahamCampbell\Security\SecurityServiceProvider::class,
         Jenssegers\Date\DateServiceProvider::class,
         Laravel\Tinker\TinkerServiceProvider::class,
-        Laravolt\Avatar\ServiceProvider::class,
         McCool\LaravelAutoPresenter\AutoPresenterServiceProvider::class,
 
         /*

config/trustedproxy.php

@@ -24,7 +24,7 @@ return [
      * of your proxy (e.g. if using ELB or similar).
      *
      */
-    'proxies' => null, // [<ip addresses>,], '*'
+    'proxies' => env('TRUSTED_PROXIES'), // [<ip addresses>,], '*'
 
     /*
      * To trust one or more specific proxies that connect