Merge branch 'jn/gitweb-customlinks'