Include extension
Merge remote-tracking branch 'origin/ssh2' into ssh2-test