Merge branch 'jn/gitweb-caching-prep'