Added better logging for ssh.
Merge branch 'test' into dev