Merge branch 'jn/gitweb-blame' (early part) into jch