Merge master.kernel.org:/pub/scm/gitk/gitk