Merge branch 'jh/gitweb-caching' (early part)