Fix a bug when using stdin
Fix a test for apparently new testing convention
Version bump
Update CHANGELOG
Merge branch 'release/2.5.0' into develop