Summary of changes: c68d736... Backport --offroot patches from upstream (*) 1196f7e... Merge branch 'master' into f16 (*) This commit already existed in another branch; no separate mail sent