Merge branch 'cc/no-gitk-build-dependency'