WaterRoof 3.8
Merge pull request #1403 from leoj3n/water-roof-3.8

WaterRoof 3.8