Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11