Quick Fix 3.5101
Merge pull request #1126 from waveney/wav29

Quick Fix 3.5101
Merge pull request #1127 from eternaldensity/master