gistfile1.diff

diff --git a/lib/ansible/runner/connection_plugins/ssh.py b/lib/ansible/runner/con
index 68c6f17..e19193f 100644
--- a/lib/ansible/runner/connection_plugins/ssh.py
+++ b/lib/ansible/runner/connection_plugins/ssh.py
@@ -237,9 +237,10 @@ class Connection(object):
                 stderr += dat
                 if dat == '':
                     rpipes.remove(p.stderr)
-            if not rpipes or p.poll() is not None:
-                p.wait()
+            if (not rpipes or not rfd) and p.poll() is not None:
                 break
+            elif p.poll() == None:
+                p.wait()
         stdin.close() # close stdin after we read from stdout (see also issue #84

         if C.HOST_KEY_CHECKING and not_in_host_file: