Merge 'git-gui' into HEAD