Merge branch 'rj/gitweb-clean-js'