Second Hugo buglet
Merge pull request #1264 from waveney/wav31

Second Hugo buglet
Merge pull request #1265 from eternaldensity/master

Hugo Buglet2