am 81adb4f8: Merge "New localhost failures...."

* commit '81adb4f8fd261be11d399d210029189e94888a9e':
  New localhost failures....