SIGN IN SIGN UP

More NaN consistency fixes (manual merge of r79875 to release31-maint).

M
Mark Dickinson committed
18628400375cb14130fde1502bd646e997b9a6de
Parent: f3ff883