Merge latest v3 tag from upstream

Lots of bugfixes/tweaks from upstream laravel (v3 branch)