Merge pull request #863 from waveney/wav26

Wav26
Merge pull request #864 from waveney/wav26

Issue #861