Merge "Fix compatibility with recent releases of Gitweb."