Upgrade Fluid to 1.8.2
Merge pull request #3642 from cwjohnston/update-fluid

Upgrade Fluid to 1.8.2