attempt to merge smarter
attempt to merge smarter

driesvints/framework,morrislaptop/framework,dwightwatson/framework,arturock/framework,samlev/framework,hafezdivandari/framework,arturock/framework,stevebauman/framework,lucasmichot/framework,driesvints/framework,stevebauman/framework,samlev/framework,bytestream/framework,JamesForks/framework,leo108/laravel_framework,laravel/framework,leo108/laravel_framework,laravel/framework,morrislaptop/framework,JamesForks/framework,arturock/framework,lucasmichot/framework,dwightwatson/framework,hafezdivandari/framework,bytestream/framework