Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6