Import from OpenSSH 6.5p1
19 files changed