Merge branch 'jc/blame' (early part) into HEAD