Tidy up for release 3.65 YIP
Merge pull request #1240 from waveney/wav31

Tidy up for release 3.65 YIP