Merge branch 'develop' of github.com:laravel/laravel into develop

database/factories/UserFactory.php

@@ -15,7 +15,7 @@ use Illuminate\Support\Str;
 |
 */
 
-/** @var \Illuminate\Database\Eloquent\Factory $factory */
+/* @var \Illuminate\Database\Eloquent\Factory $factory */
 
 $factory->define(User::class, function (Faker $faker) {
     return [