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

# Conflicts:
#	composer.lock

composer.json

@@ -50,7 +50,6 @@
         "jenssegers/date": "^3.4",
         "laravel/framework": "5.7.*",
         "laravel/tinker": "^1.0",
-        "laravolt/avatar": "^2.1",
         "mccool/laravel-auto-presenter": "^7.1",
         "nexmo/client": "^1.5",
         "pragmarx/google2fa": "^5.0",
@@ -65,7 +64,6 @@
         "filp/whoops": "^2.3",
         "fzaninotto/faker": "^1.8",
         "graham-campbell/analyzer": "^2.1",
-        "graham-campbell/testbench-core": "^3.0",
         "mockery/mockery": "^1.2",
         "phpunit/phpunit": "^7.4",
         "tightenco/mailthief": "^0.3.14"