Fix passing custom Entry model class
Merge pull request #3079 from obrignoni/2.3/develop

2.3/dev - Fix passing custom Entry model class
Merge branch 'refs/heads/2.3/develop' into 3.0/develop