Merge branch 'jn/gitweb-blame' into pu