Merge branch 'fs/ssh-signing-other-keytypes'