Merge 'gitweb-syntax' into HEAD