Merge commit 'git-gui/master'