changes suggested by upstream
Merge branch 'smartos_support' of github.com:bixu/openssh into smartos_support