fix for multiple ssh-agent processes
Merge remote-tracking branch 'origin/master'