Merge branch '4.0' of https://github.com/laravel/framework into 4.0