Merge "Fix PatchScript's mapping of lines below the last edit" into stable-2.6