Second Hugo buglet
Merge pull request #1264 from waveney/wav31

Second Hugo buglet