Merge branch 'new' of git://git.kernel.org/pub/scm/gitk/gitk into next