Sync with https://github.com/sebastianbergmann/diff/commit/7f1f4206e8aaf5adb066c8143f6540f616951190