Merge branch 'cb/ttk-style' of git-gui into cb/git-gui-ttk-style