Oops...
Merge pull request #1024 from waveney/wav29

Oops...