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