Hugo buglet
Merge pull request #1262 from waveney/wav31

Hugo buglet