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