Merge "Use deFloatIsNaN, not isnan." am: 4e49222745 am: dd33e61339 am: 558bba7fca