Last minute tweaks
Merge pull request #1021 from waveney/wav29

Version 3.42