Merge branch 'mr/gitweb-snapshot' into next