Merge pull request #838 from waveney/wav25

Issue #837