Fix Entry::stream()
Merge pull request #3080 from obrignoni/2.3/develop

Fix Entry::stream()
Merge branch 'refs/heads/2.3/develop' into 3.0/develop