merge commit #5c5042102f70671c5834b553db12f20f7c30e730 from ssh.py