merged ssh_agent from master.