Issue #844
Issue #849
Merge pull request #854 from waveney/wav25

fix for Issue #844