Merge pull request #165 from laravel-shift/l12-compatibility

Merge pull request #165 from laravel-shift/l12-compatibility #2042