Merge branch 'pp/gitweb-config-underscore'