Merge branch 'master' into python3

Conflicts:
	pdm/sshsock.py

diff --cc pdm/sshsock.py
index 6efaba9,dd53e6a..7ee26e8
--- 1/pdm/sshsock.py
--- 2/pdm/sshsock.py
+++ b/pdm/sshsock.py
@@@ -67,10 -67,12 +67,12 @@@ def cli()
              sk.connect(sys.argv[1])
          except socket.error as err:
              sys.stdout.write("SSOCK-connect: %s\n" % err)
+             sys.stdout.flush()
              return
          sys.stdout.write("SSOCK+\n")
 -        buf1 = ""
 -        buf2 = ""
+         sys.stdout.flush()
 +        buf1 = b""
 +        buf2 = b""
          while True:
              wfd = []
              if buf1: wfd.append(sk)