Updating to Fluid 1.8.2
Merge branch 'fluid_1.8.2'