Make comparison with NaN consistent with javac
Buildserver auto merge