Merge branch 'update-gitconfig-1'