Merge from vendor branch OPENSSH: