Issue #850
#850 after conflicts
Merge pull request #863 from waveney/wav26

Wav26