Water Cooler improvement
changelog
Merge pull request #2215 from DeityLink/watercooler

Water Cooler improvements