Merge branch 'pb/maint-gitweb-blob-lineno' into maint