Added boolean to turn off float color mask.
Better fix for issue 1345.
Merge remote-tracking branch 'origin/master'