Merge branch 'jc/move-gitk'