Merge branch 'pt/gitk'