Improved reconnect behaviour.
Quick fix for broken ssh key problem.
Merge branch 'test' into dev