Merge pull request #2 from laravel/master

Bringing changes from Laravel core