Summary of changes: 5457aea... backport two fixes from master (*) 941664f... Merge remote-tracking branch 'origin/master' into f20 (*) This commit already existed in another branch; no separate mail sent