Updated to reflect upstream changes to laravel 5