Merge 'gitk' into HEAD