Merge branch 'ls/git-gui-no-double-utf8-author-name'