Merge branch 'vendor/DIFFUTILS'