Summary of changes: e6eb269... Update to upstream git commit 3ddc005 (*) 1b5b8f6... Fix merge (*) This commit already existed in another branch; no separate mail sent