Issue #866
Merge pull request #874 from waveney/wav26

Issue #866