Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files