Bad day for patches
Merge pull request #1134 from waveney/wav31

Bad day for patches
Merge pull request #1135 from eternaldensity/master

3.5104 - Bad day for patches