Summary of changes: 7987f82... Merge branch 'master' into f18 (*) 0e05509... Merge branch 'f18' into f17 (*) This commit already existed in another branch; no separate mail sent