Summary of changes: bec4eb8... Update to latest upstream version (*) 2e6fe39... fix files (*) 596bdad... Merge branch 'master' into f19 (*) This commit already existed in another branch; no separate mail sent