Merge remote-tracking branch 'alexandre/fix-float'