Backport an eloquent model fix
Merge pull request #5002 from GrahamCampbell/4.1-backport

[4.1] Backport An Eloquent Model Fix