Merge from vendor branch DIFFUTILS: