Merging from laravel changes

Merge my fork with latest Laravel code base.