Summary of changes: 8c1529c... update to latest upstream version (*) 1f36fb6... Merge branches 'master' and 'f15' into f15 (*) This commit already existed in another branch; no separate mail sent