Issue #749
Version 3.51
Merge pull request #1160 from waveney/wav31

3.521 Many small fixes