Summary of changes: 20de9c9... Merge branch 'master' into f18 (*) fd5715c... Merge branch 'f18' into f17 (*) This commit already existed in another branch; no separate mail sent