Fixed a bug in the SSH script.
Merge branch 'master' into mac