Quick Fixes
Merge pull request #1183 from waveney/wav31

Quick Fixes
Merge pull request #1184 from eternaldensity/master

Version 3.6001