Issue #861
Merge pull request #864 from waveney/wav26

Issue #861