Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk into pm/gitk