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