Summary of changes: 4fd3323... new upstream: (*) c776793... new upstream (*) 7eeb8da... new upstream (*) (*) This commit already existed in another branch; no separate mail sent