Merge branch 'jn/gitweb-grep'