Merge branch 'ds/gitweb' into HEAD