Merge branch 'jn/gitweb-our-squelch'