Merged changes from laravel/laravel master branch