Merge branch 'jc/doc-diff-blobs' into maint