am 8b25009d: Merge "Revert change to win32 isatty stub"

* commit '8b25009d92626e7f1bb3b8fdf2774df20ec7a769':
  Revert change to win32 isatty stub