Merge branch 'ml/gitk' (early part)