Merge branch 'vendor/OPENSSH' (early part)