Merge branch 'jc/diff-no-index-d-f' into maint-2.3