Merge branch 'master' into laravel-merge
Merge changes from `laravel/laravel`
Merge branch 'laravel-merge'