Merge branch 'jw/gitweb-sample-update' into maint