Merge branch 'ab/gitweb-use-same-scheme' into maint