Merge git://git2.kernel.org/pub/scm/gitk/gitk