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