Merge branch '2.3' into 2.4

composer.json

@@ -35,7 +35,7 @@
         "alt-three/twitter": "^1.0",
         "alt-three/validator": "^2.0",
         "aws/aws-sdk-php": "^3.7",
-        "backup-manager/laravel": "^1.1",
+        "backup-manager/laravel": "dev-master#df53f9c9d8c6be5d7a2638f45d54b8fb7bc51e2b",
         "barryvdh/laravel-cors": "^0.8",
         "doctrine/dbal": "^2.5",
         "fideloper/proxy": "^3.1",
@@ -61,7 +61,7 @@
         "fzaninotto/faker": "^1.6",
         "graham-campbell/testbench-core": "^1.1",
         "laravel/browser-kit-testing": "^2.0",
-        "mockery/mockery": "0.9.5",
+        "mockery/mockery": "0.9.9",
         "nikic/php-parser": "^3.0",
         "phpunit/phpunit": "5.7.20",
         "symfony/css-selector": "^3.1",