Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui