Summary of changes: 2a9f553... backport some upstream fixes (*) 6a06a9d... omit patches that cancel each other out (*) (*) This commit already existed in another branch; no separate mail sent