Summary of changes: 3152a53... Add upstream xlatetom fix (#835877) (*) 0b8d01b... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent